@arbidocs/cli 0.4.109 → 0.4.111

package/dist/index.js

@@ -3695,7 +3695,7 @@ function getLatestVersion(skipCache = false) {
   }
 }
 function getCurrentVersion() {
-  return "0.4.109";
+  return "0.4.111";
 }
 function readChangelog(fromVersion, toVersion) {
   try {
@@ -3748,17 +3748,17 @@ function showChangelog(fromVersion, toVersion) {
 async function checkForUpdates(autoUpdate) {
   try {
     const latest = getLatestVersion();
-    if (!latest || latest === "0.4.109") return;
+    if (!latest || latest === "0.4.111") return;
     if (autoUpdate) {
       warn(`
-Your arbi version is out of date (${"0.4.109"} \u2192 ${latest}). Updating...`);
+Your arbi version is out of date (${"0.4.111"} \u2192 ${latest}). Updating...`);
       child_process.execSync("npm install -g @arbidocs/cli@latest", { stdio: "inherit" });
-      showChangelog("0.4.109", latest);
+      showChangelog("0.4.111", latest);
       console.log(`Updated to ${latest}.`);
     } else {
       warn(
         `
-Your arbi version is out of date (${"0.4.109"} \u2192 ${latest}).
+Your arbi version is out of date (${"0.4.111"} \u2192 ${latest}).
 Run "arbi update" to upgrade, or "arbi update auto" to always stay up to date.`
       );
     }
@@ -3790,10 +3790,10 @@ function markNagShown(latest) {
 function hintUpdateOnError() {
   try {
     const cached = readCache();
-    if (!cached || cached.latest === "0.4.109") return;
+    if (!cached || cached.latest === "0.4.111") return;
     if (!shouldShowNag(cached.latest)) return;
     warn(
-      `Your arbi version is out of date (${"0.4.109"} \u2192 ${cached.latest}). Run "arbi update".`
+      `Your arbi version is out of date (${"0.4.111"} \u2192 ${cached.latest}). Run "arbi update".`
     );
     markNagShown(cached.latest);
   } catch {
@@ -4020,15 +4020,15 @@ async function resolveWorkspace(workspaceOpt, { skipNotifications = false } = {}
     throw err;
   }
 }
-async function resolveDmCrypto() {
+async function resolveChatCrypto() {
   const authCtx = await resolveAuth();
   const { arbi, loginResult } = authCtx;
   const userExtId = arbi.session.getState().userExtId;
   if (!userExtId) {
-    error("No user ID in session \u2014 cannot set up DM encryption.");
+    error("No user ID in session \u2014 cannot set up chat encryption.");
     process.exit(1);
   }
-  const crypto = sdk.dm.createDmCryptoContext(arbi, loginResult.signingPrivateKey, userExtId);
+  const crypto = sdk.chats.createChatCryptoContext(loginResult.signingPrivateKey, userExtId);
   return { ...authCtx, crypto };
 }
 function truncate(value, width) {
@@ -4261,7 +4261,7 @@ async function startListening(agentName, config) {
     process.exit(1);
   }
   dim("Starting DM listener...");
-  const { arbi, crypto } = await resolveDmCrypto();
+  const { arbi, crypto } = await resolveChatCrypto();
   const fullConfig = resolveConfig();
   const sessionId = arbi.session.getState().userExtId ?? "default";
   const agentId = backend === "openclaw" ? sessionId.toLowerCase() : void 0;
@@ -4876,7 +4876,7 @@ function readAttachmentFiles(paths) {
     }
     return { resolved, name: path6__default.default.basename(resolved), size: fs7__default.default.statSync(resolved).size };
   });
-  sdk.dm.checkDmAttachmentLimits(stats);
+  sdk.chats.checkChatAttachmentLimits(stats);
   return stats.map(({ resolved, name }) => ({
     name,
     type: typeFromName(name),
@@ -4902,8 +4902,36 @@ function attachmentLabel(files) {
 }
 
 // src/commands/dm.ts
+var PER_CHAT = 100;
 async function resolveRecipient(arbi, ref2) {
-  return sdk.dm.resolveRecipient(arbi, ref2);
+  return sdk.chats.resolveRecipient(arbi, ref2);
+}
+async function listDmRows(arbi, crypto, options) {
+  const direct = await sdk.chats.listChats(arbi, "direct");
+  const rows = [];
+  for (const chat of direct) {
+    if (!chat.last_message) continue;
+    const ring = await sdk.chats.openChatKeyRing(chat, crypto);
+    const raw = await sdk.chats.listChatMessages(arbi, chat.external_id, {
+      limit: PER_CHAT
+    });
+    const byId = new Map(chat.members.map((m) => [m.user.external_id, m]));
+    const me = byId.get(crypto.userExtId);
+    const peer = sdk.chats.directPeer(chat, crypto.userExtId);
+    const peerMember = peer ? byId.get(peer.external_id) : me;
+    for (const m of await sdk.chats.decryptChatMessages(ring, raw)) {
+      const mine = m.sender_ext_id === crypto.userExtId;
+      const sender = (mine ? me?.user : peer) ?? null;
+      const recipient = (mine ? peer ?? me?.user : me?.user) ?? null;
+      rows.push({
+        ...m,
+        sender,
+        recipient,
+        read: sdk.chats.hasRead(mine ? peerMember : me, m)
+      });
+    }
+  }
+  return rows.sort((a, b) => Date.parse(b.created_at) - Date.parse(a.created_at));
 }
 function rowMatchesFilters(row, opts) {
   if (opts.unread && row.read) return false;
@@ -4930,17 +4958,17 @@ function rowMatchesFilters(row, opts) {
   }
   return true;
 }
+var unreadForMe = (rows, me) => rows.filter((r) => !r.read && r.sender_ext_id !== me);
 function registerDmCommand(program2) {
-  const dm = program2.command("dm").description("Direct messages (E2E encrypted)");
+  const dm = program2.command("dm").description("Direct messages (E2E encrypted 1:1 chats)");
   dm.command("list").description("List direct messages (decrypted, newest first)").option("--unread", "Only show unread messages").option("--from <email-or-extid>", "Filter by sender OR recipient (email or usr- id)").option(
     "--thread <email-or-extid>",
     "Show the full conversation with one peer (both directions)"
   ).option("--since <iso>", "Only messages newer than this ISO timestamp").option("-l, --limit <n>", "Cap to N most-recent messages", (v) => parseInt(v, 10)).option("--json", "Output as JSON (recommended for scripting / agents)").action(
     (opts) => runAction(async () => {
-      const { arbi, crypto } = await resolveDmCrypto();
-      const all = await sdk.dm.listDecryptedDMs(arbi, crypto);
-      const myExtId = arbi.session.getState().userExtId ?? void 0;
-      const dms = all.filter((r) => r.type === "user_message");
+      const { arbi, crypto } = await resolveChatCrypto();
+      const myExtId = crypto.userExtId;
+      const all = await listDmRows(arbi, crypto);
       const filterOpts = {
         unread: Boolean(opts.unread),
         from: typeof opts.from === "string" ? opts.from : void 0,
@@ -4948,17 +4976,14 @@ function registerDmCommand(program2) {
         since: typeof opts.since === "string" ? opts.since : void 0,
         myExtId
       };
-      const filtered = dms.filter((r) => rowMatchesFilters(r, filterOpts));
+      const filtered = all.filter((r) => rowMatchesFilters(r, filterOpts)).filter((r) => !filterOpts.unread || r.sender_ext_id !== myExtId);
       const limited = typeof opts.limit === "number" && opts.limit > 0 ? filtered.slice(0, opts.limit) : filtered;
       if (opts.json) {
         printJson(
-          limited.map(({ attachmentFiles, ...r }) => ({
+          limited.map(({ attachmentFiles, decryptFailed, ...r }) => ({
             ...r,
-            ...attachmentFiles ? {
-              attachment_files: publicAttachmentFiles(
-                attachmentFiles
-              )
-            } : {},
+            ...attachmentFiles ? { attachment_files: publicAttachmentFiles(attachmentFiles) } : {},
+            ...decryptFailed ? { decrypt_failed: true } : {},
             encrypted_in_transit: true
           }))
         );
@@ -4979,7 +5004,7 @@ function registerDmCommand(program2) {
           {
             header: "DIR",
             width: 4,
-            value: (r) => r.sender?.external_id === myExtId ? "\u2192" : "\u2190"
+            value: (r) => r.sender_ext_id === myExtId ? "\u2192" : "\u2190"
           },
           {
             header: "PEER",
@@ -5003,14 +5028,14 @@ function registerDmCommand(program2) {
       );
     })()
   );
-  dm.command("send [recipient] [content...]").description("Send an E2E encrypted DM (interactive if no args)").option(
+  dm.command("send [recipient] [content...]").description("Send an E2E encrypted direct message (interactive if no args)").option(
     "-a, --attach <path>",
     "Attach a file, encrypted end to end (repeatable; up to 10 files of 15 MB each)",
     collectPaths
   ).action(
     (recipient, contentParts, opts) => runAction(async () => {
       const attachmentInputs = readAttachmentFiles(opts?.attach ?? []);
-      const { arbi, crypto } = await resolveDmCrypto();
+      const { arbi, crypto } = await resolveChatCrypto();
       if (!recipient) {
         requireInteractive(
           'Pass recipient + message as arguments: arbi dm send <email-or-id> "<message>"'
@@ -5049,30 +5074,11 @@ Try: arbi contacts add ${recipient.includes("@") ? recipient : "<their-email>"}`
         );
         process.exit(3);
       }
-      const recipientExtId = resolved.extId;
-      const recipientPubKey = resolved.pubKey;
-      if (!recipientPubKey) {
-        error(
-          "Cannot send encrypted DM \u2014 recipient public key not found.\nAdd them as a contact first: arbi contacts add <email>"
-        );
-        process.exit(3);
-      }
-      const attachments = await sdk.dm.uploadDmAttachments(arbi, attachmentInputs);
-      const data = await sdk.dm.sendEncryptedDM(
-        arbi,
-        [
-          {
-            recipient_ext_id: recipientExtId,
-            content,
-            recipient_encryption_public_key: recipientPubKey
-          }
-        ],
-        crypto,
-        { attachments }
-      );
-      for (const n of data) {
-        success(`Sent (encrypted): ${n.external_id} \u2192 ${n.recipient.email}`);
-      }
+      const attachments = await sdk.chats.uploadChatAttachments(arbi, attachmentInputs);
+      const sent = await sdk.chats.sendDirectMessage(arbi, crypto, resolved.extId, content, {
+        attachments
+      });
+      success(`Sent (encrypted): ${sent.external_id} \u2192 ${recipient} (chat ${sent.chat_ext_id})`);
       for (const f of attachments) {
         success(`Attached (encrypted): ${f.id} ${f.name} (${f.size} bytes)`);
       }
@@ -5085,18 +5091,19 @@ Try: arbi contacts add ${recipient.includes("@") ? recipient : "<their-email>"}`
     "Save this attachment of the message (ids from `arbi dm list --json`) instead"
   ).option("-o, --output <path>", "Where to save the attachment (default: its file name)").action(
     (ids, opts) => runAction(async () => {
-      const { arbi, crypto } = await resolveDmCrypto();
+      const { arbi, crypto } = await resolveChatCrypto();
+      const me = crypto.userExtId;
       let msgIds = ids && ids.length > 0 ? ids : void 0;
+      const rows = await listDmRows(arbi, crypto);
       if (typeof opts?.attachment === "string") {
         if (msgIds?.length !== 1) {
-          throw new Error("Name exactly one message: arbi dm read <ntf-id> --attachment <att-id>");
+          throw new Error("Name exactly one message: arbi dm read <chm-id> --attachment <att-id>");
         }
-        const rows = await sdk.dm.listDecryptedDMs(arbi, crypto);
         const row = rows.find((m) => m.external_id === msgIds[0]);
         if (!row) throw new Error(`No message ${msgIds[0]}`);
         if (row.attachmentsError) throw new Error(row.attachmentsError);
         const file = findAttachment(row, opts.attachment);
-        const bytes = await sdk.dm.downloadDmAttachment(arbi, file);
+        const bytes = await sdk.chats.downloadChatAttachment(arbi, file);
         const target = attachmentOutputPath(
           file,
           typeof opts.output === "string" ? opts.output : void 0
@@ -5105,13 +5112,9 @@ Try: arbi contacts add ${recipient.includes("@") ? recipient : "<their-email>"}`
         success(`Saved ${target} (${bytes.length} bytes, decrypted)`);
         return;
       }
-      if (!msgIds && opts?.all) {
-        const data2 = await sdk.dm.listDecryptedDMs(arbi, crypto);
-        msgIds = data2.filter((m) => !m.read).map((m) => m.external_id);
-      }
+      const unread = unreadForMe(rows, me);
+      if (!msgIds && opts?.all) msgIds = unread.map((m) => m.external_id);
       if (!msgIds) {
-        const data2 = await sdk.dm.listDecryptedDMs(arbi, crypto);
-        const unread = data2.filter((m) => !m.read);
         if (unread.length === 0) {
           process.stderr.write("No unread messages.\n");
           return;
@@ -5120,8 +5123,7 @@ Try: arbi contacts add ${recipient.includes("@") ? recipient : "<their-email>"}`
         msgIds = await promptCheckbox(
           "Select messages to mark as read",
           unread.map((m) => {
-            const s = m.sender;
-            const from = sdk.formatUserName(s) || s?.email || "";
+            const from = sdk.formatUserName(m.sender) || m.sender?.email || "";
             return {
               name: `${from}: ${(m.content ?? "").slice(0, 50)}`,
               value: m.external_id
@@ -5134,32 +5136,42 @@ Try: arbi contacts add ${recipient.includes("@") ? recipient : "<their-email>"}`
         process.stderr.write("No unread messages.\n");
         return;
       }
-      const data = await sdk.dm.markRead(arbi, msgIds);
-      success(`Marked ${data.length} message(s) as read.`);
+      const wanted = new Set(msgIds);
+      const targets = rows.filter((r) => wanted.has(r.external_id));
+      const missing = msgIds.filter((id) => !targets.some((r) => r.external_id === id));
+      if (missing.length) throw new Error(`No message ${missing.join(", ")}`);
+      const newestPerChat = /* @__PURE__ */ new Map();
+      for (const r of targets) {
+        const cur = newestPerChat.get(r.chat_ext_id);
+        if (!cur || Date.parse(r.created_at) > Date.parse(cur.created_at)) {
+          newestPerChat.set(r.chat_ext_id, r);
+        }
+      }
+      for (const [chatExtId, r] of newestPerChat) {
+        await sdk.chats.markChatRead(arbi, chatExtId, r.external_id);
+      }
+      success(`Marked ${targets.length} message(s) as read.`);
     })()
   );
-  dm.command("delete [ids...]").description("Delete messages (interactive picker if no IDs given)").option("--all", "Delete every message in your DM history (no picker, no prompt)").option("--dry-run", "Preview which messages would be deleted (no SDK call)").action(
+  dm.command("delete [ids...]").description("Delete your own messages (interactive picker if no IDs given)").option("--all", "Delete every message you sent in direct chats (no picker, no prompt)").option("--dry-run", "Preview which messages would be deleted (no SDK call)").action(
     (ids, opts) => runAction(async () => {
-      const { arbi, crypto } = await resolveDmCrypto();
+      const { arbi, crypto } = await resolveChatCrypto();
+      const rows = await listDmRows(arbi, crypto);
+      const own = rows.filter((r) => r.sender_ext_id === crypto.userExtId);
       let msgIds = ids && ids.length > 0 ? ids : void 0;
-      if (!msgIds && opts?.all) {
-        const data = await sdk.dm.listDecryptedDMs(arbi, crypto);
-        msgIds = data.map((m) => m.external_id);
-      }
+      if (!msgIds && opts?.all) msgIds = own.map((m) => m.external_id);
       if (!msgIds) {
-        const data = await sdk.dm.listDecryptedDMs(arbi, crypto);
-        if (data.length === 0) {
+        if (own.length === 0) {
           process.stderr.write("No messages found.\n");
           return;
         }
-        requireInteractive("Pass IDs directly or use --all to delete the whole inbox.");
+        requireInteractive("Pass IDs directly or use --all to delete all your messages.");
         msgIds = await promptCheckbox(
           "Select messages to delete",
-          data.map((m) => {
-            const s = m.sender;
-            const from = sdk.formatUserName(s) || s?.email || "";
+          own.map((m) => {
+            const to = sdk.formatUserName(m.recipient) || m.recipient?.email || "";
             return {
-              name: `${from}: ${(m.content ?? "").slice(0, 50)}`,
+              name: `\u2192 ${to}: ${(m.content ?? "").slice(0, 50)}`,
               value: m.external_id
             };
           })
@@ -5170,11 +5182,16 @@ Try: arbi contacts add ${recipient.includes("@") ? recipient : "<their-email>"}`
         process.stderr.write("No messages to delete.\n");
         return;
       }
+      const chatOf = new Map(rows.map((r) => [r.external_id, r.chat_ext_id]));
+      const unknown = msgIds.filter((id) => !chatOf.has(id));
+      if (unknown.length) throw new Error(`No message ${unknown.join(", ")}`);
       if (opts?.dryRun) {
         dryRun(`delete ${msgIds.length} message(s)`, msgIds);
         return;
       }
-      await sdk.dm.deleteDMs(arbi, msgIds);
+      for (const id of msgIds) {
+        await sdk.chats.deleteChatMessage(arbi, chatOf.get(id), id);
+      }
       success(`Deleted ${msgIds.length} message(s).`);
     })()
   );
@@ -5538,7 +5555,7 @@ function registerWorkspacesCommand(program2) {
     "Target a specific workspace id (advanced \u2014 usually omitted; the owner picks)"
   ).action(
     (owner, opts) => runAction(async () => {
-      const { arbi, crypto, loginResult } = await resolveDmCrypto();
+      const { arbi, crypto, loginResult } = await resolveChatCrypto();
       const resolved = await resolveRecipient(arbi, owner);
       if (!resolved || !resolved.pubKey) {
         error(
@@ -5547,7 +5564,7 @@ Try: arbi contacts add ${owner.includes("@") ? owner : "<their-email>"}`
         );
         process.exit(3);
       }
-      await sdk.dm.requestWorkspaceAccess(
+      await sdk.notifications.requestWorkspaceAccess(
         arbi,
         {
           recipientExtId: resolved.extId,
@@ -8302,6 +8319,10 @@ Timeout (${timeoutSec}s), closing.`));
   );
 }
 init_prompts();
+var asContact = (row) => row;
+function contactLabel(c) {
+  return c.card?.name || sdk.formatUserName(c.user) || "";
+}
 function redactPictures(rows) {
   return rows.map((row) => {
     const user = row.user;
@@ -8317,7 +8338,7 @@ function redactPictures(rows) {
   });
 }
 function registerContactsCommand(program2) {
-  const contacts = program2.command("contacts").description("Contacts: list, add, remove");
+  const contacts = program2.command("contacts").description("Contacts: list, add, search, remove");
   contacts.command("list").description("List all contacts").option("--json", "Output as JSON").option("--include-pictures", "Keep base64 profile-picture bytes in --json output").action(
     (opts) => runAction(async () => {
       const { arbi } = await resolveAuth();
@@ -8332,20 +8353,20 @@ function registerContactsCommand(program2) {
       }
       printTable(
         [
-          { header: "ID", width: 16, value: (r) => r.external_id },
+          { header: "ID", width: 16, value: (r) => asContact(r).external_id ?? "" },
+          { header: "NAME", width: 20, value: (r) => contactLabel(asContact(r)) },
           {
-            header: "NAME",
-            width: 20,
-            value: (r) => sdk.formatUserName(r.user)
+            header: "EMAIL",
+            width: 30,
+            value: (r) => asContact(r).email ?? asContact(r).card?.emails?.[0]?.email ?? ""
           },
-          { header: "EMAIL", width: 30, value: (r) => r.email },
-          { header: "STATUS", width: 18, value: (r) => r.status }
+          { header: "STATUS", width: 18, value: (r) => asContact(r).status }
         ],
         data
       );
     })()
   );
-  contacts.command("add [emails...]").description("Add contacts by email (prompt if no emails given)").action(
+  contacts.command("add [emails...]").description("Invite or link people by email (prompt if no emails given)").action(
     (emails) => runAction(async () => {
       const { arbi } = await resolveAuth();
       if (!emails || emails.length === 0) {
@@ -8354,12 +8375,39 @@ function registerContactsCommand(program2) {
         emails = input2.split(",").map((e) => e.trim()).filter(Boolean);
         if (emails.length === 0) return;
       }
-      const data = await sdk.contacts.addContacts(arbi, emails);
+      const data = await sdk.contacts.inviteContacts(arbi, emails);
       for (const c of data) {
-        success(`Added: ${c.email} (${c.external_id}) \u2014 ${c.status}`);
+        if (c.status === "failed") {
+          process.stderr.write(`Failed: ${c.email} \u2014 ${c.outcome_detail ?? "not invited"}
+`);
+        } else {
+          success(`Added: ${c.email} (${c.external_id}) \u2014 ${c.outcome ?? c.status}`);
+        }
       }
     })()
   );
+  contacts.command("search <query>").description("Search your contacts and people who share a workspace with you").option("--json", "Output as JSON").action(
+    (query, opts) => runAction(async () => {
+      const { arbi } = await resolveAuth();
+      const data = await sdk.contacts.searchContacts(arbi, query);
+      if (opts.json) {
+        printJson(data);
+        return;
+      }
+      if (data.length === 0) {
+        process.stderr.write("No matches.\n");
+        return;
+      }
+      printTable(
+        [
+          { header: "NAME", width: 24, value: (r) => r.name ?? "" },
+          { header: "EMAIL", width: 30, value: (r) => r.email },
+          { header: "SOURCE", width: 10, value: (r) => r.source }
+        ],
+        data
+      );
+    })()
+  );
   contacts.command("remove [ids...]").description("Remove contacts (interactive picker if no IDs given)").option("--dry-run", "Preview which contacts would be removed (no SDK call)").action(
     (ids, opts) => runAction(async () => {
       const { arbi } = await resolveAuth();
@@ -8373,10 +8421,11 @@ function registerContactsCommand(program2) {
         requireInteractive("Pass contact IDs directly: arbi contacts remove cnt-\u2026");
         contactIds = await promptCheckbox(
           "Select contacts to remove",
-          data.map((c) => {
-            const name = sdk.formatUserName(c.user);
+          data.filter((c) => c.external_id).map((c) => {
+            const name = contactLabel(c);
+            const email = c.email ?? "";
             return {
-              name: name ? `${name} (${c.email})` : c.email,
+              name: name && email ? `${name} (${email})` : name || email || "(no name)",
               value: c.external_id
             };
           })
@@ -8387,7 +8436,7 @@ function registerContactsCommand(program2) {
         dryRun(`remove ${contactIds.length} contact(s)`, contactIds);
         return;
       }
-      await sdk.contacts.removeContacts(arbi, contactIds);
+      for (const id of contactIds) await sdk.contacts.deleteContact(arbi, id);
       success(`Removed ${contactIds.length} contact(s).`);
     })()
   );
@@ -8396,6 +8445,190 @@ function registerContactsCommand(program2) {
     await contacts.commands.find((c) => c.name() === "list").parseAsync(tail, { from: "user" });
   });
 }
+async function resolveMembers(arbi, refs) {
+  const out = [];
+  for (const ref2 of refs) {
+    const r = await resolveRecipient(arbi, ref2);
+    if (!r) {
+      error(`No contact or workspace member found for: ${ref2}`);
+      process.exit(3);
+    }
+    if (sdk.chats.isAgentExtId(r.extId)) {
+      error(`${ref2} is a personal agent: agents cannot join a group chat`);
+      process.exit(3);
+    }
+    out.push({ external_id: r.extId, encryption_public_key: r.pubKey });
+  }
+  return out;
+}
+async function readyChat(arbi, crypto, chatExtId) {
+  return sdk.chats.ensureChatKeyCurrent(arbi, await sdk.chats.getChat(arbi, chatExtId), crypto);
+}
+function registerChatCommand(program2) {
+  const chat = program2.command("chat").description("Chats: direct and group (E2E encrypted)");
+  chat.command("list").description("List your chats, most recently active first").option("--kind <kind>", "direct | group | meeting").option("--json", "Output as JSON").action(
+    (opts) => runAction(async () => {
+      const { arbi, crypto } = await resolveChatCrypto();
+      const list = await sdk.chats.listChats(arbi, opts.kind);
+      const rows = await Promise.all(
+        list.map(async (c) => {
+          const ring = await sdk.chats.openChatKeyRing(c, crypto);
+          const peer = sdk.chats.directPeer(c, crypto.userExtId);
+          const name = c.kind === "direct" ? sdk.formatUserName(peer) || peer?.email || "(yourself)" : await sdk.chats.decryptChatTitle(ring, c) ?? c.members.filter((m) => m.user.external_id !== crypto.userExtId).map((m) => sdk.formatUserName(m.user) || m.user.email).join(", ");
+          return {
+            external_id: c.external_id,
+            kind: c.kind,
+            name,
+            members: c.members.length,
+            unread: c.unread_count,
+            last_message_at: c.last_message_at ?? null
+          };
+        })
+      );
+      if (opts.json) {
+        printJson(rows);
+        return;
+      }
+      if (rows.length === 0) {
+        process.stderr.write("No chats.\n");
+        return;
+      }
+      printTable(
+        [
+          { header: "ID", width: 14, value: (r) => r.external_id },
+          { header: "KIND", width: 8, value: (r) => r.kind },
+          { header: "NAME", width: 36, value: (r) => truncate(r.name, 35) },
+          { header: "MEMBERS", width: 8, value: (r) => String(r.members) },
+          { header: "UNREAD", width: 7, value: (r) => String(r.unread) }
+        ],
+        rows
+      );
+    })()
+  );
+  chat.command("create").description("Create a group chat with at least one other person (no agents)").requiredOption(
+    "-m, --member <email-or-id>",
+    "A member (repeatable)",
+    (v, prev = []) => [...prev, v]
+  ).option("-t, --title <title>", "Group title (encrypted)").action(
+    (opts) => runAction(async () => {
+      const { arbi, crypto } = await resolveChatCrypto();
+      const members = await resolveMembers(arbi, opts.member);
+      const created = await sdk.chats.createGroupChat(arbi, crypto, {
+        title: opts.title,
+        members
+      });
+      success(
+        `Created group (encrypted): ${created.external_id} (${created.members.length} members)`
+      );
+    })()
+  );
+  chat.command("send <chatId> <text...>").description("Post a message to a chat").action(
+    (chatId, textParts) => runAction(async () => {
+      const { arbi, crypto } = await resolveChatCrypto();
+      const c = await readyChat(arbi, crypto, chatId);
+      const sent = await sdk.chats.sendChatMessage(
+        arbi,
+        await sdk.chats.openChatKeyRing(c, crypto),
+        textParts.join(" ")
+      );
+      success(`Sent (encrypted): ${sent.external_id} \u2192 ${chatId}`);
+    })()
+  );
+  chat.command("show <chatId>").description("Show the newest messages of a chat, decrypted").option("-l, --limit <n>", "How many messages", (v) => parseInt(v, 10)).option("--json", "Output as JSON").action(
+    (chatId, opts) => runAction(async () => {
+      const { arbi, crypto } = await resolveChatCrypto();
+      const loaded = await sdk.chats.loadDecryptedChat(
+        arbi,
+        crypto,
+        await sdk.chats.getChat(arbi, chatId),
+        { limit: opts.limit }
+      );
+      const names = new Map(
+        loaded.chat.members.map((m) => [
+          m.user.external_id,
+          sdk.formatUserName(m.user) || m.user.email
+        ])
+      );
+      const rows = loaded.messages.map(({ attachmentFiles, ...m }) => ({
+        ...m,
+        ...attachmentFiles ? { attachment_files: publicAttachmentFiles(attachmentFiles) } : {},
+        sender: m.sender_ext_id ? names.get(m.sender_ext_id) ?? m.sender_ext_id : ""
+      }));
+      if (opts.json) {
+        printJson({ ...loaded.chat, title: loaded.title, messages: rows });
+        return;
+      }
+      printTable(
+        [
+          { header: "ID", width: 14, value: (r) => r.external_id },
+          { header: "FROM", width: 24, value: (r) => truncate(r.sender, 23) },
+          {
+            header: "CONTENT",
+            width: 60,
+            value: (r) => truncate(r.content ?? "", 59)
+          }
+        ],
+        rows
+      );
+    })()
+  );
+  chat.command("members <chatId>").description("List the members of a chat").action(
+    (chatId) => runAction(async () => {
+      const { arbi } = await resolveChatCrypto();
+      const c = await sdk.chats.getChat(arbi, chatId);
+      printTable(
+        [
+          { header: "ID", width: 14, value: (r) => r.id },
+          { header: "NAME", width: 28, value: (r) => r.name },
+          { header: "ROLE", width: 8, value: (r) => r.role }
+        ],
+        c.members.map((m) => ({
+          id: m.user.external_id,
+          name: sdk.formatUserName(m.user) || m.user.email,
+          role: m.role
+        }))
+      );
+    })()
+  );
+  chat.command("add <chatId> <refs...>").description("Add people to a group (they can read the current epoch)").action(
+    (chatId, refs) => runAction(async () => {
+      const { arbi, crypto } = await resolveChatCrypto();
+      const members = await resolveMembers(arbi, refs);
+      const c = await readyChat(arbi, crypto, chatId);
+      const updated = await sdk.chats.addChatMembers(
+        arbi,
+        await sdk.chats.openChatKeyRing(c, crypto),
+        members
+      );
+      success(`Added ${members.length} member(s) to ${chatId} (${updated.members.length} now)`);
+    })()
+  );
+  chat.command("remove <chatId> <userId>").description("Remove a member (owners only); a new epoch key is sealed to the rest").action(
+    (chatId, userId) => runAction(async () => {
+      const { arbi, crypto } = await resolveChatCrypto();
+      await sdk.chats.removeChatMember(arbi, chatId, userId);
+      await readyChat(arbi, crypto, chatId);
+      success(`Removed ${userId} from ${chatId}; rotated the chat key`);
+    })()
+  );
+  chat.command("leave <chatId>").description("Leave a group chat").action(
+    (chatId) => runAction(async () => {
+      const { arbi, crypto } = await resolveChatCrypto();
+      await sdk.chats.removeChatMember(arbi, chatId, crypto.userExtId);
+      success(`Left ${chatId}`);
+    })()
+  );
+  chat.arguments("[maybeSubcommand]").action(async (maybe) => {
+    if (maybe) {
+      suggestSubcommandAndExit(
+        "chat",
+        maybe,
+        chat.commands.map((c) => c.name())
+      );
+    }
+    await chat.commands.find((c) => c.name() === "list").parseAsync([], { from: "user" });
+  });
+}
 init_prompts();
 function formatSpan(startIso, endIso) {
   const start = new Date(startIso);
@@ -11359,16 +11592,15 @@ ${message.text}`);
   });
 }
 function registerNotificationsCommand(program2) {
-  const notif = program2.command("notifications").enablePositionalOptions().description("Non-DM notifications");
-  notif.command("list").description("List non-DM notifications (workspace invites, contact accepts, \u2026)").option("--unread", "Only show unread notifications").option("--type <comma-list>", "Filter to specific type(s), e.g. workspaceuser_invited").option("-l, --limit <n>", "Cap to N most-recent", (v) => parseInt(v, 10)).option("--json", "Output as JSON (recommended for scripting / agents)").action(
+  const notif = program2.command("notifications").enablePositionalOptions().description("Notifications (workspace invites, contact accepts, \u2026)");
+  notif.command("list").description("List notifications (workspace invites, contact accepts, \u2026)").option("--unread", "Only show unread notifications").option("--type <comma-list>", "Filter to specific type(s), e.g. workspaceuser_invited").option("-l, --limit <n>", "Cap to N most-recent", (v) => parseInt(v, 10)).option("--json", "Output as JSON (recommended for scripting / agents)").action(
     (opts) => runAction(async () => {
-      const { arbi, crypto } = await resolveDmCrypto();
-      const all = await sdk.dm.listDecryptedDMs(arbi, crypto);
-      const nonDm = all.filter((r) => r.type !== "user_message");
+      const { arbi } = await resolveAuth();
+      const all = await sdk.notifications.listNotifications(arbi);
       const typeFilter = opts.type ? new Set(
         opts.type.split(",").map((t) => t.trim()).filter(Boolean)
       ) : null;
-      const filtered = nonDm.filter((r) => {
+      const filtered = all.filter((r) => {
         if (opts.unread && r.read) return false;
         if (typeFilter && !typeFilter.has(r.type ?? "")) return false;
         return true;
@@ -11390,7 +11622,7 @@ function registerNotificationsCommand(program2) {
           {
             header: "CONTENT",
             width: 50,
-            // Non-DM rows usually carry a JSON-encoded payload in
+            // Rows usually carry a JSON-encoded payload in
             // `content`. Show the first slice and let the JSON path
             // expose the full thing for agents that want to introspect.
             value: (r) => truncate(r.content ?? "", 49)
@@ -11400,30 +11632,30 @@ function registerNotificationsCommand(program2) {
       );
     })()
   );
-  notif.command("mark-read [ids...]").description("Mark notifications as read (use --all to drain the unread queue)").option("--all", "Mark every unread non-DM notification as read").action(
+  notif.command("mark-read [ids...]").description("Mark notifications as read (use --all to drain the unread queue)").option("--all", "Mark every unread notification as read").action(
     (ids, opts) => runAction(async () => {
-      const { arbi, crypto } = await resolveDmCrypto();
+      const { arbi } = await resolveAuth();
       let toMark = ids && ids.length > 0 ? ids : void 0;
       if (!toMark && opts.all) {
-        const all = await sdk.dm.listDecryptedDMs(arbi, crypto);
-        toMark = all.filter((r) => r.type !== "user_message" && !r.read).map((r) => r.external_id);
+        const all = await sdk.notifications.listNotifications(arbi);
+        toMark = all.filter((r) => !r.read).map((r) => r.external_id);
       }
       if (!toMark || toMark.length === 0) {
         process.stderr.write("Nothing to mark read. (Pass IDs or --all.)\n");
         return;
       }
-      const data = await sdk.dm.markRead(arbi, toMark);
+      const data = await sdk.notifications.markNotificationsRead(arbi, toMark);
       process.stdout.write(`Marked ${data.length} notification(s) as read.
 `);
     })()
   );
-  notif.command("delete [ids...]").description("Delete notifications by ID (or use --all to clear non-DM noise)").option("--all", "Delete every non-DM notification (workspace invites, contact accepts, ...)").option("--dry-run", "Preview which notifications would be deleted (no SDK call)").action(
+  notif.command("delete [ids...]").description("Delete notifications by ID (or use --all to clear them all)").option("--all", "Delete every notification (workspace invites, contact accepts, ...)").option("--dry-run", "Preview which notifications would be deleted (no SDK call)").action(
     (ids, opts) => runAction(async () => {
-      const { arbi, crypto } = await resolveDmCrypto();
+      const { arbi } = await resolveAuth();
       let toDelete = ids && ids.length > 0 ? ids : void 0;
       if (!toDelete && opts.all) {
-        const all = await sdk.dm.listDecryptedDMs(arbi, crypto);
-        toDelete = all.filter((r) => r.type !== "user_message").map((r) => r.external_id);
+        const all = await sdk.notifications.listNotifications(arbi);
+        toDelete = all.map((r) => r.external_id);
       }
       if (!toDelete || toDelete.length === 0) {
         process.stderr.write("Nothing to delete. (Pass IDs or --all.)\n");
@@ -11433,7 +11665,7 @@ function registerNotificationsCommand(program2) {
         dryRun(`delete ${toDelete.length} notification(s)`, toDelete);
         return;
       }
-      await sdk.dm.deleteDMs(arbi, toDelete);
+      await sdk.notifications.deleteNotifications(arbi, toDelete);
       process.stdout.write(`Deleted ${toDelete.length} notification(s).
 `);
     })()
@@ -12272,7 +12504,7 @@ console.info = (...args) => {
   _origInfo(...args);
 };
 var program = new commander.Command();
-program.name("arbi").description("ARBI CLI \u2014 interact with ARBI from the terminal").version("0.4.109").showHelpAfterError(true).showSuggestionAfterError(true);
+program.name("arbi").description("ARBI CLI \u2014 interact with ARBI from the terminal").version("0.4.111").showHelpAfterError(true).showSuggestionAfterError(true);
 registerConfigCommand(program);
 registerLoginCommand(program);
 registerRegisterCommand(program);
@@ -12289,6 +12521,7 @@ registerFindCommand(program);
 registerWatchCommand(program);
 registerContactsCommand(program);
 registerDmCommand(program);
+registerChatCommand(program);
 registerTagsCommand(program);
 registerTagKindsCommand(program);
 registerTimelineCommand(program);