@arbidocs/cli 0.3.89 → 0.3.90

package/dist/index.js

@@ -3694,7 +3694,7 @@ function getLatestVersion(skipCache = false) {
   }
 }
 function getCurrentVersion() {
-  return "0.3.89";
+  return "0.3.90";
 }
 function readChangelog(fromVersion, toVersion) {
   try {
@@ -3747,17 +3747,17 @@ function showChangelog(fromVersion, toVersion) {
 async function checkForUpdates(autoUpdate) {
   try {
     const latest = getLatestVersion();
-    if (!latest || latest === "0.3.89") return;
+    if (!latest || latest === "0.3.90") return;
     if (autoUpdate) {
       warn(`
-Your arbi version is out of date (${"0.3.89"} \u2192 ${latest}). Updating...`);
+Your arbi version is out of date (${"0.3.90"} \u2192 ${latest}). Updating...`);
       child_process.execSync("npm install -g @arbidocs/cli@latest", { stdio: "inherit" });
-      showChangelog("0.3.89", latest);
+      showChangelog("0.3.90", latest);
       console.log(`Updated to ${latest}.`);
     } else {
       warn(
         `
-Your arbi version is out of date (${"0.3.89"} \u2192 ${latest}).
+Your arbi version is out of date (${"0.3.90"} \u2192 ${latest}).
 Run "arbi update" to upgrade, or "arbi update auto" to always stay up to date.`
       );
     }
@@ -3789,10 +3789,10 @@ function markNagShown(latest) {
 function hintUpdateOnError() {
   try {
     const cached = readCache();
-    if (!cached || cached.latest === "0.3.89") return;
+    if (!cached || cached.latest === "0.3.90") return;
     if (!shouldShowNag(cached.latest)) return;
     warn(
-      `Your arbi version is out of date (${"0.3.89"} \u2192 ${cached.latest}). Run "arbi update".`
+      `Your arbi version is out of date (${"0.3.90"} \u2192 ${cached.latest}). Run "arbi update".`
     );
     markNagShown(cached.latest);
   } catch {
@@ -4803,6 +4803,283 @@ function registerStatusCommand(program2) {
   });
 }
 init_prompts();
+async function resolveRecipient(arbi, ref2) {
+  const isEmail = ref2.includes("@");
+  const matchKey = isEmail ? "email" : "external_id";
+  const contacts = await sdk.contacts.listContacts(arbi);
+  const contactMatch = contacts.find((c) => {
+    if (isEmail) return c.email === ref2;
+    const u = c.user;
+    return u?.external_id === ref2 || c.external_id === ref2;
+  });
+  if (contactMatch) {
+    const u = contactMatch.user;
+    const extId = u?.external_id ?? contactMatch.external_id;
+    const pubKey = u?.encryption_public_key ?? "";
+    if (pubKey) return { extId, pubKey };
+  }
+  try {
+    const agents = await sdk.agents.listAgents(arbi);
+    const agentMatch = agents.find((a) => a[matchKey] === ref2);
+    if (agentMatch) {
+      return { extId: agentMatch.external_id, pubKey: agentMatch.encryption_public_key };
+    }
+  } catch {
+  }
+  try {
+    const wsUsers = await sdk.workspaces.listWorkspaceUsers(arbi);
+    const wsMatch = wsUsers.find((wu) => wu[matchKey] === ref2);
+    if (wsMatch) {
+      const u = wsMatch;
+      return {
+        extId: u.external_id,
+        pubKey: u.encryption_public_key
+      };
+    }
+  } catch {
+  }
+  return null;
+}
+function rowMatchesFilters(row, opts) {
+  if (opts.unread && row.read) return false;
+  const sender = row.sender;
+  const recipient = row.recipient;
+  if (opts.from) {
+    const needle = opts.from.toLowerCase();
+    const senderMatch = sender?.email?.toLowerCase() === needle || sender?.external_id === opts.from;
+    const recipientMatch = recipient?.email?.toLowerCase() === needle || recipient?.external_id === opts.from;
+    if (!senderMatch && !recipientMatch) return false;
+  }
+  if (opts.thread) {
+    const needle = opts.thread.toLowerCase();
+    const peer = sender?.external_id === opts.myExtId ? recipient : sender;
+    const peerMatch = peer?.email?.toLowerCase() === needle || peer?.external_id === opts.thread;
+    if (!peerMatch) return false;
+  }
+  if (opts.since) {
+    const cutoff = Date.parse(opts.since);
+    if (Number.isFinite(cutoff)) {
+      const createdAt = typeof row.created_at === "string" ? Date.parse(row.created_at) : NaN;
+      if (!Number.isFinite(createdAt) || createdAt < cutoff) return false;
+    }
+  }
+  return true;
+}
+function registerDmCommand(program2) {
+  const dm = program2.command("dm").description("Direct messages (E2E encrypted)");
+  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: crypto2 } = await resolveDmCrypto();
+      const all = await sdk.dm.listDecryptedDMs(arbi, crypto2);
+      const myExtId = arbi.session.getState().userExtId ?? void 0;
+      const dms = all.filter((r) => r.type === "user_message");
+      const filterOpts = {
+        unread: Boolean(opts.unread),
+        from: typeof opts.from === "string" ? opts.from : void 0,
+        thread: typeof opts.thread === "string" ? opts.thread : void 0,
+        since: typeof opts.since === "string" ? opts.since : void 0,
+        myExtId
+      };
+      const filtered = dms.filter((r) => rowMatchesFilters(r, filterOpts));
+      const limited = typeof opts.limit === "number" && opts.limit > 0 ? filtered.slice(0, opts.limit) : filtered;
+      if (opts.json) {
+        printJson(limited.map((r) => ({ ...r, encrypted_in_transit: true })));
+        return;
+      }
+      if (limited.length === 0) {
+        process.stderr.write("No messages found.\n");
+        return;
+      }
+      const peer = (r) => {
+        const s = r.sender;
+        const recip = r.recipient;
+        return s?.external_id === myExtId ? recip : s;
+      };
+      printTable(
+        [
+          { header: "ID", width: 16, value: (r) => r.external_id },
+          {
+            header: "DIR",
+            width: 4,
+            value: (r) => r.sender?.external_id === myExtId ? "\u2192" : "\u2190"
+          },
+          {
+            header: "PEER",
+            width: 26,
+            value: (r) => {
+              const p = peer(r);
+              return sdk.formatUserName(p) || p?.email || "";
+            }
+          },
+          { header: "READ", width: 6, value: (r) => r.read ? "yes" : "no" },
+          {
+            header: "CONTENT",
+            width: 50,
+            value: (r) => truncate(r.content ?? "", 49)
+          }
+        ],
+        limited
+      );
+    })()
+  );
+  dm.command("send [recipient] [content...]").description("Send an E2E encrypted DM (interactive if no args)").action(
+    (recipient, contentParts) => runAction(async () => {
+      const { arbi, crypto: crypto2 } = await resolveDmCrypto();
+      if (!recipient) {
+        requireInteractive(
+          'Pass recipient + message as arguments: arbi dm send <email-or-id> "<message>"'
+        );
+        const contacts = await sdk.contacts.listContacts(arbi);
+        if (contacts.length === 0) {
+          error("No contacts found. Add contacts first: arbi contacts add <email>");
+          process.exit(1);
+        }
+        recipient = await promptSelect(
+          "Send to",
+          contacts.map((c) => {
+            const u = c.user;
+            const name = sdk.formatUserName(u);
+            return {
+              name: name ? `${name} (${c.email})` : c.email,
+              value: u?.external_id ?? c.external_id,
+              description: c.email
+            };
+          })
+        );
+      }
+      let content = contentParts?.length ? contentParts.join(" ") : void 0;
+      if (!content) {
+        requireInteractive(
+          'Pass the message as a positional argument: arbi dm send <email> "your message"'
+        );
+        content = await promptInput("Message");
+      }
+      const resolved = await resolveRecipient(arbi, recipient);
+      if (!resolved) {
+        error(
+          `No contact, agent, or workspace member found for: ${recipient}
+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 data = await sdk.dm.sendEncryptedDM(
+        arbi,
+        [
+          {
+            recipient_ext_id: recipientExtId,
+            content,
+            recipient_encryption_public_key: recipientPubKey
+          }
+        ],
+        crypto2
+      );
+      for (const n of data) {
+        success(`Sent (encrypted): ${n.external_id} \u2192 ${n.recipient.email}`);
+      }
+    })()
+  );
+  dm.command("read [ids...]").description("Mark messages as read (interactive picker if no IDs given)").option("--all", "Mark every unread message as read (no picker)").action(
+    (ids, opts) => runAction(async () => {
+      const { arbi, crypto: crypto2 } = await resolveDmCrypto();
+      let msgIds = ids && ids.length > 0 ? ids : void 0;
+      if (!msgIds && opts?.all) {
+        const data2 = await sdk.dm.listDecryptedDMs(arbi, crypto2);
+        msgIds = data2.filter((m) => !m.read).map((m) => m.external_id);
+      }
+      if (!msgIds) {
+        const data2 = await sdk.dm.listDecryptedDMs(arbi, crypto2);
+        const unread = data2.filter((m) => !m.read);
+        if (unread.length === 0) {
+          process.stderr.write("No unread messages.\n");
+          return;
+        }
+        requireInteractive("Pass IDs directly or use --all to mark every unread message read.");
+        msgIds = await promptCheckbox(
+          "Select messages to mark as read",
+          unread.map((m) => {
+            const s = m.sender;
+            const from = sdk.formatUserName(s) || s?.email || "";
+            return {
+              name: `${from}: ${(m.content ?? "").slice(0, 50)}`,
+              value: m.external_id
+            };
+          })
+        );
+        if (msgIds.length === 0) return;
+      }
+      if (msgIds.length === 0) {
+        process.stderr.write("No unread messages.\n");
+        return;
+      }
+      const data = await sdk.dm.markRead(arbi, msgIds);
+      success(`Marked ${data.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(
+    (ids, opts) => runAction(async () => {
+      const { arbi, crypto: crypto2 } = await resolveDmCrypto();
+      let msgIds = ids && ids.length > 0 ? ids : void 0;
+      if (!msgIds && opts?.all) {
+        const data = await sdk.dm.listDecryptedDMs(arbi, crypto2);
+        msgIds = data.map((m) => m.external_id);
+      }
+      if (!msgIds) {
+        const data = await sdk.dm.listDecryptedDMs(arbi, crypto2);
+        if (data.length === 0) {
+          process.stderr.write("No messages found.\n");
+          return;
+        }
+        requireInteractive("Pass IDs directly or use --all to delete the whole inbox.");
+        msgIds = await promptCheckbox(
+          "Select messages to delete",
+          data.map((m) => {
+            const s = m.sender;
+            const from = sdk.formatUserName(s) || s?.email || "";
+            return {
+              name: `${from}: ${(m.content ?? "").slice(0, 50)}`,
+              value: m.external_id
+            };
+          })
+        );
+        if (msgIds.length === 0) return;
+      }
+      if (msgIds.length === 0) {
+        process.stderr.write("No messages to delete.\n");
+        return;
+      }
+      if (opts?.dryRun) {
+        dryRun(`delete ${msgIds.length} message(s)`, msgIds);
+        return;
+      }
+      await sdk.dm.deleteDMs(arbi, msgIds);
+      success(`Deleted ${msgIds.length} message(s).`);
+    })()
+  );
+  dm.arguments("[maybeSubcommand]").action(async (maybe) => {
+    if (maybe) {
+      suggestSubcommandAndExit(
+        "dm",
+        maybe,
+        dm.commands.map((c) => c.name())
+      );
+    }
+    await dm.commands.find((c) => c.name() === "list").parseAsync([], { from: "user" });
+  });
+}
+
+// src/commands/workspaces.ts
+init_prompts();
 function resolveWorkspaceSelector(list, selector) {
   const byId = list.find((w) => w.external_id === selector);
   if (byId) return { ok: true, id: byId.external_id, ws: byId };
@@ -5144,6 +5421,36 @@ function registerWorkspacesCommand(program2) {
       for (const u of data) success(`Added: ${u.user.email} as ${u.role}`);
     })()
   );
+  workspace.command("request-access <owner>").description("Ask another user to grant you access to one of their workspaces").option("--note <note>", "Optional message to the workspace owner").option(
+    "-w, --workspace <id>",
+    "Target a specific workspace id (advanced \u2014 usually omitted; the owner picks)"
+  ).action(
+    (owner, opts) => runAction(async () => {
+      const { arbi, crypto: crypto2, loginResult } = await resolveDmCrypto();
+      const resolved = await resolveRecipient(arbi, owner);
+      if (!resolved || !resolved.pubKey) {
+        error(
+          `No contact, agent, or workspace member found for: ${owner}
+Try: arbi contacts add ${owner.includes("@") ? owner : "<their-email>"}`
+        );
+        process.exit(3);
+      }
+      await sdk.dm.requestWorkspaceAccess(
+        arbi,
+        {
+          recipientExtId: resolved.extId,
+          recipientEncryptionPublicKey: resolved.pubKey,
+          sessionPubkeyB64: arbi.crypto.bytesToBase64(loginResult.serverSessionKey),
+          note: opts.note,
+          workspaceExtId: opts.workspace
+        },
+        crypto2
+      );
+      success(
+        `Requested workspace access from ${owner}` + (opts.workspace ? ` (workspace ${opts.workspace})` : "") + ". They\u2019ll be notified and can grant temporary or permanent access."
+      );
+    })()
+  );
   workspace.command("remove-user <users...>").description("Remove users from the active workspace (accepts usr-ids or emails)").option("-w, --workspace <id>", "Workspace ID (defaults to selected workspace)").option("--dry-run", "Preview which users would be removed (no SDK call)").action(
     (users, opts) => runAction(async () => {
       const { arbi } = await resolveWorkspace(opts.workspace);
@@ -7748,394 +8055,119 @@ Timeout (${timeoutSec}s), closing.`));
       await done;
       if (timer) clearTimeout(timer);
       process.removeListener("SIGINT", sigintHandler);
-      if (timedOut && maxCount && messageCount < maxCount) {
-        if (jsonMode) {
-          console.log(
-            JSON.stringify({
-              type: "timeout",
-              received: messageCount,
-              expected: maxCount,
-              timeout_seconds: timeoutSec
-            })
-          );
-        } else {
-          console.error(
-            chalk2__default.default.yellow(`Timed out before reaching ${maxCount} messages (got ${messageCount}).`)
-          );
-        }
-        process.exit(124);
-      }
-    })()
-  );
-}
-init_prompts();
-function redactPictures(rows) {
-  return rows.map((row) => {
-    const user = row.user;
-    if (!user || typeof user.picture !== "string" || user.picture.length === 0) return row;
-    return {
-      ...row,
-      user: {
-        ...user,
-        has_picture: true,
-        picture: null
-      }
-    };
-  });
-}
-function registerContactsCommand(program2) {
-  const contacts = program2.command("contacts").description("Contacts: list, add, 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();
-      const data = await sdk.contacts.listContacts(arbi);
-      if (opts.json) {
-        printJson(opts.includePictures ? data : redactPictures(data));
-        return;
-      }
-      if (data.length === 0) {
-        process.stderr.write("No contacts found.\n");
-        return;
-      }
-      printTable(
-        [
-          { header: "ID", width: 16, value: (r) => r.external_id },
-          {
-            header: "NAME",
-            width: 20,
-            value: (r) => sdk.formatUserName(r.user)
-          },
-          { header: "EMAIL", width: 30, value: (r) => r.email },
-          { header: "STATUS", width: 18, value: (r) => r.status }
-        ],
-        data
-      );
-    })()
-  );
-  contacts.command("add [emails...]").description("Add contacts by email (prompt if no emails given)").action(
-    (emails) => runAction(async () => {
-      const { arbi } = await resolveAuth();
-      if (!emails || emails.length === 0) {
-        requireInteractive("Pass email(s) as positional args: arbi contacts add foo@x.y bar@x.y");
-        const input2 = await promptInput("Email address(es), comma-separated");
-        emails = input2.split(",").map((e) => e.trim()).filter(Boolean);
-        if (emails.length === 0) return;
-      }
-      const data = await sdk.contacts.addContacts(arbi, emails);
-      for (const c of data) {
-        success(`Added: ${c.email} (${c.external_id}) \u2014 ${c.status}`);
-      }
-    })()
-  );
-  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();
-      let contactIds = ids && ids.length > 0 ? ids : void 0;
-      if (!contactIds) {
-        const data = await sdk.contacts.listContacts(arbi);
-        if (data.length === 0) {
-          process.stderr.write("No contacts found.\n");
-          return;
-        }
-        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);
-            return {
-              name: name ? `${name} (${c.email})` : c.email,
-              value: c.external_id
-            };
-          })
-        );
-        if (contactIds.length === 0) return;
-      }
-      if (opts?.dryRun) {
-        dryRun(`remove ${contactIds.length} contact(s)`, contactIds);
-        return;
-      }
-      await sdk.contacts.removeContacts(arbi, contactIds);
-      success(`Removed ${contactIds.length} contact(s).`);
-    })()
-  );
-  contacts.allowUnknownOption(true).allowExcessArguments(true).action(async () => {
-    const tail = contacts.args ?? [];
-    await contacts.commands.find((c) => c.name() === "list").parseAsync(tail, { from: "user" });
-  });
-}
-init_prompts();
-async function resolveRecipient(arbi, ref2) {
-  const isEmail = ref2.includes("@");
-  const matchKey = isEmail ? "email" : "external_id";
-  const contacts = await sdk.contacts.listContacts(arbi);
-  const contactMatch = contacts.find((c) => {
-    if (isEmail) return c.email === ref2;
-    const u = c.user;
-    return u?.external_id === ref2 || c.external_id === ref2;
-  });
-  if (contactMatch) {
-    const u = contactMatch.user;
-    const extId = u?.external_id ?? contactMatch.external_id;
-    const pubKey = u?.encryption_public_key ?? "";
-    if (pubKey) return { extId, pubKey };
-  }
-  try {
-    const agents = await sdk.agents.listAgents(arbi);
-    const agentMatch = agents.find((a) => a[matchKey] === ref2);
-    if (agentMatch) {
-      return { extId: agentMatch.external_id, pubKey: agentMatch.encryption_public_key };
-    }
-  } catch {
-  }
-  try {
-    const wsUsers = await sdk.workspaces.listWorkspaceUsers(arbi);
-    const wsMatch = wsUsers.find((wu) => wu[matchKey] === ref2);
-    if (wsMatch) {
-      const u = wsMatch;
-      return {
-        extId: u.external_id,
-        pubKey: u.encryption_public_key
-      };
-    }
-  } catch {
-  }
-  return null;
-}
-function rowMatchesFilters(row, opts) {
-  if (opts.unread && row.read) return false;
-  const sender = row.sender;
-  const recipient = row.recipient;
-  if (opts.from) {
-    const needle = opts.from.toLowerCase();
-    const senderMatch = sender?.email?.toLowerCase() === needle || sender?.external_id === opts.from;
-    const recipientMatch = recipient?.email?.toLowerCase() === needle || recipient?.external_id === opts.from;
-    if (!senderMatch && !recipientMatch) return false;
-  }
-  if (opts.thread) {
-    const needle = opts.thread.toLowerCase();
-    const peer = sender?.external_id === opts.myExtId ? recipient : sender;
-    const peerMatch = peer?.email?.toLowerCase() === needle || peer?.external_id === opts.thread;
-    if (!peerMatch) return false;
-  }
-  if (opts.since) {
-    const cutoff = Date.parse(opts.since);
-    if (Number.isFinite(cutoff)) {
-      const createdAt = typeof row.created_at === "string" ? Date.parse(row.created_at) : NaN;
-      if (!Number.isFinite(createdAt) || createdAt < cutoff) return false;
-    }
-  }
-  return true;
+      if (timedOut && maxCount && messageCount < maxCount) {
+        if (jsonMode) {
+          console.log(
+            JSON.stringify({
+              type: "timeout",
+              received: messageCount,
+              expected: maxCount,
+              timeout_seconds: timeoutSec
+            })
+          );
+        } else {
+          console.error(
+            chalk2__default.default.yellow(`Timed out before reaching ${maxCount} messages (got ${messageCount}).`)
+          );
+        }
+        process.exit(124);
+      }
+    })()
+  );
 }
-function registerDmCommand(program2) {
-  const dm = program2.command("dm").description("Direct messages (E2E encrypted)");
-  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(
+init_prompts();
+function redactPictures(rows) {
+  return rows.map((row) => {
+    const user = row.user;
+    if (!user || typeof user.picture !== "string" || user.picture.length === 0) return row;
+    return {
+      ...row,
+      user: {
+        ...user,
+        has_picture: true,
+        picture: null
+      }
+    };
+  });
+}
+function registerContactsCommand(program2) {
+  const contacts = program2.command("contacts").description("Contacts: list, add, 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, crypto: crypto2 } = await resolveDmCrypto();
-      const all = await sdk.dm.listDecryptedDMs(arbi, crypto2);
-      const myExtId = arbi.session.getState().userExtId ?? void 0;
-      const dms = all.filter((r) => r.type === "user_message");
-      const filterOpts = {
-        unread: Boolean(opts.unread),
-        from: typeof opts.from === "string" ? opts.from : void 0,
-        thread: typeof opts.thread === "string" ? opts.thread : void 0,
-        since: typeof opts.since === "string" ? opts.since : void 0,
-        myExtId
-      };
-      const filtered = dms.filter((r) => rowMatchesFilters(r, filterOpts));
-      const limited = typeof opts.limit === "number" && opts.limit > 0 ? filtered.slice(0, opts.limit) : filtered;
+      const { arbi } = await resolveAuth();
+      const data = await sdk.contacts.listContacts(arbi);
       if (opts.json) {
-        printJson(limited.map((r) => ({ ...r, encrypted_in_transit: true })));
+        printJson(opts.includePictures ? data : redactPictures(data));
         return;
       }
-      if (limited.length === 0) {
-        process.stderr.write("No messages found.\n");
+      if (data.length === 0) {
+        process.stderr.write("No contacts found.\n");
         return;
       }
-      const peer = (r) => {
-        const s = r.sender;
-        const recip = r.recipient;
-        return s?.external_id === myExtId ? recip : s;
-      };
       printTable(
         [
           { header: "ID", width: 16, value: (r) => r.external_id },
           {
-            header: "DIR",
-            width: 4,
-            value: (r) => r.sender?.external_id === myExtId ? "\u2192" : "\u2190"
-          },
-          {
-            header: "PEER",
-            width: 26,
-            value: (r) => {
-              const p = peer(r);
-              return sdk.formatUserName(p) || p?.email || "";
-            }
+            header: "NAME",
+            width: 20,
+            value: (r) => sdk.formatUserName(r.user)
           },
-          { header: "READ", width: 6, value: (r) => r.read ? "yes" : "no" },
-          {
-            header: "CONTENT",
-            width: 50,
-            value: (r) => truncate(r.content ?? "", 49)
-          }
-        ],
-        limited
-      );
-    })()
-  );
-  dm.command("send [recipient] [content...]").description("Send an E2E encrypted DM (interactive if no args)").action(
-    (recipient, contentParts) => runAction(async () => {
-      const { arbi, crypto: crypto2 } = await resolveDmCrypto();
-      if (!recipient) {
-        requireInteractive(
-          'Pass recipient + message as arguments: arbi dm send <email-or-id> "<message>"'
-        );
-        const contacts = await sdk.contacts.listContacts(arbi);
-        if (contacts.length === 0) {
-          error("No contacts found. Add contacts first: arbi contacts add <email>");
-          process.exit(1);
-        }
-        recipient = await promptSelect(
-          "Send to",
-          contacts.map((c) => {
-            const u = c.user;
-            const name = sdk.formatUserName(u);
-            return {
-              name: name ? `${name} (${c.email})` : c.email,
-              value: u?.external_id ?? c.external_id,
-              description: c.email
-            };
-          })
-        );
-      }
-      let content = contentParts?.length ? contentParts.join(" ") : void 0;
-      if (!content) {
-        requireInteractive(
-          'Pass the message as a positional argument: arbi dm send <email> "your message"'
-        );
-        content = await promptInput("Message");
-      }
-      const resolved = await resolveRecipient(arbi, recipient);
-      if (!resolved) {
-        error(
-          `No contact, agent, or workspace member found for: ${recipient}
-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 data = await sdk.dm.sendEncryptedDM(
-        arbi,
-        [
-          {
-            recipient_ext_id: recipientExtId,
-            content,
-            recipient_encryption_public_key: recipientPubKey
-          }
+          { header: "EMAIL", width: 30, value: (r) => r.email },
+          { header: "STATUS", width: 18, value: (r) => r.status }
         ],
-        crypto2
+        data
       );
-      for (const n of data) {
-        success(`Sent (encrypted): ${n.external_id} \u2192 ${n.recipient.email}`);
-      }
     })()
   );
-  dm.command("read [ids...]").description("Mark messages as read (interactive picker if no IDs given)").option("--all", "Mark every unread message as read (no picker)").action(
-    (ids, opts) => runAction(async () => {
-      const { arbi, crypto: crypto2 } = await resolveDmCrypto();
-      let msgIds = ids && ids.length > 0 ? ids : void 0;
-      if (!msgIds && opts?.all) {
-        const data2 = await sdk.dm.listDecryptedDMs(arbi, crypto2);
-        msgIds = data2.filter((m) => !m.read).map((m) => m.external_id);
-      }
-      if (!msgIds) {
-        const data2 = await sdk.dm.listDecryptedDMs(arbi, crypto2);
-        const unread = data2.filter((m) => !m.read);
-        if (unread.length === 0) {
-          process.stderr.write("No unread messages.\n");
-          return;
-        }
-        requireInteractive("Pass IDs directly or use --all to mark every unread message read.");
-        msgIds = await promptCheckbox(
-          "Select messages to mark as read",
-          unread.map((m) => {
-            const s = m.sender;
-            const from = sdk.formatUserName(s) || s?.email || "";
-            return {
-              name: `${from}: ${(m.content ?? "").slice(0, 50)}`,
-              value: m.external_id
-            };
-          })
-        );
-        if (msgIds.length === 0) return;
+  contacts.command("add [emails...]").description("Add contacts by email (prompt if no emails given)").action(
+    (emails) => runAction(async () => {
+      const { arbi } = await resolveAuth();
+      if (!emails || emails.length === 0) {
+        requireInteractive("Pass email(s) as positional args: arbi contacts add foo@x.y bar@x.y");
+        const input2 = await promptInput("Email address(es), comma-separated");
+        emails = input2.split(",").map((e) => e.trim()).filter(Boolean);
+        if (emails.length === 0) return;
       }
-      if (msgIds.length === 0) {
-        process.stderr.write("No unread messages.\n");
-        return;
+      const data = await sdk.contacts.addContacts(arbi, emails);
+      for (const c of data) {
+        success(`Added: ${c.email} (${c.external_id}) \u2014 ${c.status}`);
       }
-      const data = await sdk.dm.markRead(arbi, msgIds);
-      success(`Marked ${data.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(
+  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, crypto: crypto2 } = await resolveDmCrypto();
-      let msgIds = ids && ids.length > 0 ? ids : void 0;
-      if (!msgIds && opts?.all) {
-        const data = await sdk.dm.listDecryptedDMs(arbi, crypto2);
-        msgIds = data.map((m) => m.external_id);
-      }
-      if (!msgIds) {
-        const data = await sdk.dm.listDecryptedDMs(arbi, crypto2);
+      const { arbi } = await resolveAuth();
+      let contactIds = ids && ids.length > 0 ? ids : void 0;
+      if (!contactIds) {
+        const data = await sdk.contacts.listContacts(arbi);
         if (data.length === 0) {
-          process.stderr.write("No messages found.\n");
+          process.stderr.write("No contacts found.\n");
           return;
         }
-        requireInteractive("Pass IDs directly or use --all to delete the whole inbox.");
-        msgIds = await promptCheckbox(
-          "Select messages to delete",
-          data.map((m) => {
-            const s = m.sender;
-            const from = sdk.formatUserName(s) || s?.email || "";
+        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);
             return {
-              name: `${from}: ${(m.content ?? "").slice(0, 50)}`,
-              value: m.external_id
+              name: name ? `${name} (${c.email})` : c.email,
+              value: c.external_id
             };
           })
         );
-        if (msgIds.length === 0) return;
-      }
-      if (msgIds.length === 0) {
-        process.stderr.write("No messages to delete.\n");
-        return;
+        if (contactIds.length === 0) return;
       }
       if (opts?.dryRun) {
-        dryRun(`delete ${msgIds.length} message(s)`, msgIds);
+        dryRun(`remove ${contactIds.length} contact(s)`, contactIds);
         return;
       }
-      await sdk.dm.deleteDMs(arbi, msgIds);
-      success(`Deleted ${msgIds.length} message(s).`);
+      await sdk.contacts.removeContacts(arbi, contactIds);
+      success(`Removed ${contactIds.length} contact(s).`);
     })()
   );
-  dm.arguments("[maybeSubcommand]").action(async (maybe) => {
-    if (maybe) {
-      suggestSubcommandAndExit(
-        "dm",
-        maybe,
-        dm.commands.map((c) => c.name())
-      );
-    }
-    await dm.commands.find((c) => c.name() === "list").parseAsync([], { from: "user" });
+  contacts.allowUnknownOption(true).allowExcessArguments(true).action(async () => {
+    const tail = contacts.args ?? [];
+    await contacts.commands.find((c) => c.name() === "list").parseAsync(tail, { from: "user" });
   });
 }
 init_prompts();
@@ -10273,7 +10305,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.3.89").showHelpAfterError(true).showSuggestionAfterError(true);
+program.name("arbi").description("ARBI CLI \u2014 interact with ARBI from the terminal").version("0.3.90").showHelpAfterError(true).showSuggestionAfterError(true);
 registerConfigCommand(program);
 registerLoginCommand(program);
 registerRegisterCommand(program);